3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-04-30 10:36:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix incorrect topic sending on internal srepl notify helper

Browse source
This commit is contained in:
Andrey Antukh 2025-04-03 10:58:10 +02:00
parent 5d600c6715
commit 78919df886
1 changed files with 78 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
backend/src/app/srepl/main.clj
View file

@ -210,7 +210,7 @@
The message can be a free text or a preconfigured one. The message can be a free text or a preconfigured one.
The destination can be: all, profile-id, team-id, or a coll of them." The destination can be: all, profile-id, team-id, or a coll of them."
[{:keys [::mbus/msgbus ::db/pool]} & {:keys [dest code message level] [& {:keys [dest code message level]
:or {code :generic level :info} :or {code :generic level :info}
:as params}] :as params}]
@ -219,7 +219,10 @@
:code :incorrect-level :code :incorrect-level
:hint (str "level '" level "' not supported"))) :hint (str "level '" level "' not supported")))
(letfn [(send [dest] (let [{:keys [::mbus/msgbus ::db/pool]} main/system
send
(fn [dest]
(l/inf :hint "sending notification" :dest (str dest)) (l/inf :hint "sending notification" :dest (str dest))
(let [message {:type :notification (let [message {:type :notification
:code code :code code
@ -230,19 +233,22 @@
message (->> (dissoc params :dest :code :message :level) message (->> (dissoc params :dest :code :message :level)
(merge message))] (merge message))]
(mbus/pub! msgbus (mbus/pub! msgbus
:topic (str dest) :topic dest
:message message))) :message message)))
(resolve-profile [email] resolve-profile
(fn [email]
(some-> (db/get* pool :profile {:email (str/lower email)} {:columns [:id]}) :id vector)) (some-> (db/get* pool :profile {:email (str/lower email)} {:columns [:id]}) :id vector))
(resolve-team [team-id] resolve-team
(fn [team-id]
(->> (db/query pool :team-profile-rel (->> (db/query pool :team-profile-rel
{:team-id team-id} {:team-id team-id}
{:columns [:profile-id]}) {:columns [:profile-id]})
(map :profile-id))) (map :profile-id)))
(resolve-dest [dest] resolve-dest
(fn resolve-dest [dest]
(cond (cond
(= :all dest) (= :all dest)
[uuid/zero] [uuid/zero]
@ -254,7 +260,7 @@
(some-> dest h/parse-uuid resolve-dest) (some-> dest h/parse-uuid resolve-dest)
(nil? dest) (nil? dest)
(resolve-dest uuid/zero) [uuid/zero]
(map? dest) (map? dest)
(sequence (comp (sequence (comp