appview/notify: use correct actor on issue/pr state change events #740

Signed-off-by: Seongmin Lee git@boltless.me

+7 -7

7 changed files

Interdiff #0 → #1

expand all

unified split

appview

indexer

notifier.go

issues

issues.go

notify

db.go

merged_notifier.go

notifier.go

posthog

notifier.go

pulls

pulls.go

appview/indexer/notifier.go

This patch was likely rebased, as context lines do not match.

appview/issues/issues.go

This patch was likely rebased, as context lines do not match.

appview/notify/db/db.go

This patch was likely rebased, as context lines do not match.

appview/notify/merged_notifier.go

This patch was likely rebased, as context lines do not match.

appview/notify/notifier.go

This patch was likely rebased, as context lines do not match.

appview/notify/posthog/notifier.go

This patch was likely rebased, as context lines do not match.

+7 -7

appview/pulls/pulls.go

··· 2106 2106 } 2107 2107 2108 2108 func (s *Pulls) MergePull(w http.ResponseWriter, r *http.Request) { 2109 + user := s.oauth.GetUser(r) 2109 2110 f, err := s.repoResolver.Resolve(r) 2110 2111 if err != nil { 2111 2112 log.Println("failed to resolve repo:", err) ··· 2117 2118 } 2118 2119 2119 2120 func (s *Pulls) MergePull(w http.ResponseWriter, r *http.Request) { 2120 - user := s.oauth.GetUser(r) 2121 2121 f, err := s.repoResolver.Resolve(r) 2122 2122 if err != nil { 2123 2123 log.Println("failed to resolve repo:", err) ··· 2217 2217 2218 2218 // notify about the pull merge 2219 2219 for _, p := range pullsToMerge { 2220 - s.notifier.NewPullState(r.Context(), p) 2220 + s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2221 2221 } 2222 2222 2223 2223 s.pages.HxLocation(w, fmt.Sprintf("/@%s/%s/pulls/%d", f.OwnerHandle(), f.Name, pull.PullId)) ··· 2228 2228 2229 2229 // notify about the pull merge 2230 2230 for _, p := range pullsToMerge { 2231 - s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2231 + s.notifier.NewPullState(r.Context(), p) 2232 2232 } 2233 2233 2234 2234 s.pages.HxLocation(w, fmt.Sprintf("/@%s/%s/pulls/%d", f.OwnerHandle(), f.Name, pull.PullId)) ··· 2289 2289 } 2290 2290 2291 2291 for _, p := range pullsToClose { 2292 - s.notifier.NewPullState(r.Context(), p) 2292 + s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2293 2293 } 2294 2294 2295 2295 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId)) ··· 2300 2300 } 2301 2301 2302 2302 for _, p := range pullsToClose { 2303 - s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2303 + s.notifier.NewPullState(r.Context(), p) 2304 2304 } 2305 2305 2306 2306 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId)) ··· 2362 2362 } 2363 2363 2364 2364 for _, p := range pullsToReopen { 2365 - s.notifier.NewPullState(r.Context(), p) 2365 + s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2366 2366 } 2367 2367 2368 2368 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId)) ··· 2373 2373 } 2374 2374 2375 2375 for _, p := range pullsToReopen { 2376 - s.notifier.NewPullState(r.Context(), syntax.DID(user.Did), p) 2376 + s.notifier.NewPullState(r.Context(), p) 2377 2377 } 2378 2378 2379 2379 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))