Skip to content

Commit 6ca3933

Browse files
committed
fix user-statuses after migration from status-im#6722
1 parent 719b9f1 commit 6ca3933

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

src/status_im/data_store/realm/schemas/account/core.cljs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,4 +340,7 @@
340340
:migration migrations/v24}
341341
{:schema v25
342342
:schemaVersion 25
343-
:migration migrations/v25}])
343+
:migration migrations/v25}
344+
{:schema v25
345+
:schemaVersion 26
346+
:migration migrations/v26}])

src/status_im/data_store/realm/schemas/account/migrations.cljs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@
203203
(let [user-status (aget user-statuses i)
204204
message-id (aget user-status "message-id")
205205
new-message-id (get @old-ids->new-ids message-id)
206-
whisper-id (aget user-status "whisper-identity")
207-
new-status-id (str new-message-id "-" whisper-id)]
206+
public-key (aget user-status "public-key")
207+
new-status-id (str new-message-id "-" public-key)]
208208
(if (contains? @updated-message-statuses-ids new-status-id)
209209
(vswap! statuses-to-be-deleted conj user-status)
210210
(do
@@ -214,3 +214,19 @@
214214

215215
(doseq [status @statuses-to-be-deleted]
216216
(.delete new-realm status))))
217+
218+
(defn v26 [old-realm new-realm]
219+
(let [user-statuses (.objects new-realm "user-status")]
220+
(dotimes [i (.-length user-statuses)]
221+
(let [user-status (aget user-statuses i)
222+
status-id (aget user-status "message-id")
223+
message-id (aget user-status "message-id")
224+
public-key (aget user-status "public-key")
225+
new-status-id (str message-id "-" public-key)]
226+
(when (and (= "-" (last status-id)))
227+
(if (.objectForPrimaryKey
228+
new-realm
229+
"user-status"
230+
new-status-id)
231+
(.delete new-realm user-status)
232+
(aset user-status "status-id" new-status-id)))))))

0 commit comments

Comments
 (0)