Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on: [push, pull_request]
jobs:
ubuntu-gcc:
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- name: Checkout V
uses: actions/checkout@v4
Expand All @@ -26,7 +27,8 @@ jobs:
cd gitly
v -cc gcc .

- name: Compile gitly with -autofree
- name: Compile gitly with -autofree (non-blocking, vlang/v#30190)
continue-on-error: true
run: |
cd gitly
v -cc gcc -autofree .
Expand Down Expand Up @@ -54,6 +56,7 @@ jobs:

macos-clang:
runs-on: macos-latest
timeout-minutes: 60
steps:
- name: Checkout V
uses: actions/checkout@v4
Expand All @@ -71,7 +74,8 @@ jobs:
run: |
cd gitly
v -cc clang .
- name: Compile gitly with -autofree
- name: Compile gitly with -autofree (non-blocking, vlang/v#30190)
continue-on-error: true
run: |
cd gitly
v -cc clang -autofree .
Expand All @@ -95,6 +99,7 @@ jobs:

windows-gcc:
runs-on: windows-latest
timeout-minutes: 60
env:
VFLAGS: -cc gcc
steps:
Expand All @@ -107,21 +112,23 @@ jobs:
with:
path: gitly
- name: Build V
shell: cmd
run: |
./make.bat -gcc

# Must come after "Build V": this used to run first, when neither `v`
# nor `v.exe` existed, so the referenced script could not work at all.
make.bat -gcc
# Must run after "Build V": the script shells out to `v.exe`, which
# does not exist until V is built.
- name: Install SQLite
run: .\gitly\.github\workflows\windows-install-sqlite.bat

shell: cmd
run: |
gitly\.github\workflows\windows-install-sqlite.bat
- name: Compile gitly
run: |
dir
.\v.exe -cc gcc gitly
.\v.exe -cc gcc -d sqlite gitly

ubuntu-tcc:
runs-on: ubuntu-latest
timeout-minutes: 60
env:
VFLAGS: -cc tcc -d no_backtrace -d no_segfault_handler
steps:
Expand All @@ -141,7 +148,8 @@ jobs:
make
sudo ./v symlink

- name: Compile gitly with -autofree
- name: Compile gitly with -autofree (non-blocking, vlang/v#30190)
continue-on-error: true
run: |
cd gitly
v -autofree .
Expand Down
9 changes: 6 additions & 3 deletions gitly.v
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ fn new_app() !&App {

mut app := &App{
// db: sqlite.connect('gitly.sqlite') or { panic(err) }
db: connect_db(conf)!
config: conf
db: connect_db(conf)!
config: conf
started_at: time.now().unix()
}

Expand Down Expand Up @@ -484,6 +484,9 @@ fn (mut app App) create_tables() ! {
sql app.db {
create table Comment
}!
sql app.db {
create table CommentReaction
}!
sql app.db {
create table Branch
}!
Expand Down Expand Up @@ -914,7 +917,7 @@ fn (mut app App) add_missing_column(table_name string, column_name string, colum
fn (mut ctx Context) json_success[T](result T) veb.Result {
response := api.ApiSuccessResponse[T]{
success: true
result: result
result: result
}

return ctx.json(response)
Expand Down
42 changes: 40 additions & 2 deletions repo/comment.v
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,30 @@ mut:
text string
}

struct CommentReaction {
mut:
id int @[primary; sql: serial]
comment_id int
user_id int
emoji string
}

fn (mut app App) toggle_comment_reaction(cid int, uid int, em string) ! {
existing := sql app.db {
select from CommentReaction where comment_id == cid && user_id == uid && emoji == em
} or { []CommentReaction{} }
if existing.len > 0 {
sql app.db {
delete from CommentReaction where comment_id == cid && user_id == uid && emoji == em
}!
} else {
r := CommentReaction{ comment_id: cid, user_id: uid, emoji: em }
sql app.db {
insert r into CommentReaction
}!
}
}

@['/:username/:repo_name/comments'; post]
pub fn (mut app App) handle_add_comment(mut ctx Context, username string, repo_name string) veb.Result {
repo := app.find_repo_by_name_and_username(repo_name, username) or { return ctx.not_found() }
Expand Down Expand Up @@ -62,9 +86,9 @@ fn (mut app App) add_issue_comment(author_id int, issue_id int, text string) ! {
}!
}

fn (mut app App) get_all_issue_comments(issue_id int) []Comment {
fn (mut app App) get_all_issue_comments(iid int) []Comment {
comments := sql app.db {
select from Comment where issue_id == issue_id order by id
select from Comment where issue_id == iid order by id
} or { []Comment{} }

return comments
Expand All @@ -73,3 +97,17 @@ fn (mut app App) get_all_issue_comments(issue_id int) []Comment {
fn (c Comment) relative() string {
return time.unix(c.created_at).relative()
}

@['/:username/:repo_name/comments/:comment_id/react'; post]
pub fn (mut app App) handle_toggle_comment_reaction(mut ctx Context, username string, repo_name string, comment_id string) veb.Result {
if !ctx.logged_in {
return ctx.not_found()
}
cid := comment_id.int()
emoji := ctx.form['emoji'] or { '' }
if emoji == '' {
return ctx.redirect('/${username}/${repo_name}')
}
app.toggle_comment_reaction(cid, ctx.user.id, emoji) or { app.info(err.str()) }
return ctx.redirect('/${username}/${repo_name}')
}
10 changes: 5 additions & 5 deletions repo/repo.v
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ mut:
primary_branch string
webhook_secret string
tags_count int
nr_open_issues int @[orm: 'open_issues_count']
nr_open_prs int @[orm: 'open_prs_count']
nr_releases int @[orm: 'releases_count']
nr_branches int @[orm: 'branches_count']
nr_open_issues int @[sql: 'open_issues_count']
nr_open_prs int @[sql: 'open_prs_count']
nr_releases int @[sql: 'releases_count']
nr_branches int @[sql: 'branches_count']
nr_tags int
nr_stars int @[orm: 'stars_count']
nr_stars int @[sql: 'stars_count']
lang_stats []LangStat @[skip]
created_at int
nr_contributors int
Expand Down
Loading