1460 Commits

Author SHA1 Message Date
withchao
3ef62d4aa5 fix 2024-06-28 16:57:01 +08:00
withchao
affa909e17 fix 2024-06-28 16:31:53 +08:00
withchao
3960d28a10 config 2024-06-28 16:22:20 +08:00
withchao
8f86049599 user online 2024-06-28 16:18:21 +08:00
withchao
8f0403e67c user online 2024-06-26 18:19:38 +08:00
withchao
9b043feca7 seq user 2024-06-24 17:34:49 +08:00
withchao
8e3890ed88 seq 2024-06-21 18:24:30 +08:00
withchao
2d2941a526 seq 2024-06-20 15:56:02 +08:00
withchao
425008a610 Merge remote-tracking branch 'origin/seq38' into seq38 2024-06-20 15:32:09 +08:00
withchao
ac9f4f667d Merge remote-tracking branch 'origin/list' into seq38 2024-06-20 15:23:00 +08:00
withchao
88c1510be7 Merge remote-tracking branch 'origin/list' into list 2024-06-20 14:57:47 +08:00
withchao
03d4564596 user version 2024-06-20 14:55:59 +08:00
withchao
4074f81343 Merge branch 'refs/heads/list' into seq38 2024-06-19 21:16:40 +08:00
Gordon
4f359b7335 fix: sort by id avoid unstable sort friends. 2024-06-19 20:35:32 +08:00
Gordon
5006af5b54 fix: sort by id avoid unstable sort friends. 2024-06-19 20:28:09 +08:00
Gordon
924888dbd1 fix: sort by id avoid unstable sort friends. 2024-06-19 20:17:28 +08:00
withchao
1ee33f36f7 group 2024-06-19 17:38:30 +08:00
withchao
7182298d2f Merge remote-tracking branch 'origin/list' into seq38 2024-06-19 17:00:15 +08:00
withchao
f613c6dfc9 group 2024-06-19 16:52:44 +08:00
withchao
08cb4a948d group 2024-06-19 16:28:28 +08:00
Gordon
aff8322bc5 fix: sort by id avoid unstable sort friends. 2024-06-18 21:04:03 +08:00
withchao
cce382d0c3 seq 2024-06-18 18:06:40 +08:00
withchao
a2a28b43c5 seq 2024-06-18 16:46:06 +08:00
withchao
d55d416f68 seq 2024-06-17 17:41:28 +08:00
withchao
ec40d824f6 Merge remote-tracking branch 'origin/main' into list
# Conflicts:
#	go.mod
#	go.sum
2024-06-17 15:38:29 +08:00
withchao
bd4fb8a1a0 merge 2024-06-17 15:37:13 +08:00
withchao
c161330208 Merge remote-tracking branch 'origin/list' into list
# Conflicts:
#	go.mod
#	go.sum
#	internal/api/router.go
#	internal/rpc/group/sync.go
2024-06-17 15:34:49 +08:00
chao
51567959db
Merge branch 'openimsdk:main' into main 2024-06-17 15:28:54 +08:00
withchao
a41c8c6a9d group version 2024-06-17 15:28:09 +08:00
chao
1aa610cf69
Merge pull request #2 from icey-yu/friend-increamental
Get Full Friend IDs
2024-06-14 18:56:23 +08:00
withchao
fe4842b496 seq 2024-06-14 18:49:05 +08:00
icey-yu
cee1a496e9 feat: api and config 2024-06-14 18:29:54 +08:00
icey-yu
f19f6f9112 feat: get full friend user ids 2024-06-14 17:17:59 +08:00
icey-yu
c5fa596cdd refactor: change incremental to full 2024-06-14 17:14:43 +08:00
icey-yu
904842b15d update: go mod 2024-06-14 17:04:03 +08:00
withchao
ef71d0cf62 seq 2024-06-14 10:54:24 +08:00
icey-yu
877abfe7ce
Fix group and config (#2341)
* fix:fcm config path

* update:go mod(only one can create group)

* feat:get fcm config from url

* fix:err and name

* fix:config name and annotation

* refactor:change FCM config name

* refactor:change standardized URL

* Update openim-push.yml

---------

Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
2024-06-13 04:13:13 +00:00
icey-yu
180532317e
fix:FCM push failed will return error (#2347)
* fix:FCM push failed will return error

* fix:change error delimiter
2024-06-13 04:09:00 +00:00
Monet Lee
a8d5ec314a
feat: implement to invalid token when forceKickOff user. (#2345)
* feat: implement to invalid token when forceKickOff user.

* fix uncorrect contents.

* fix: remove unnecessary contents.
2024-06-13 01:55:07 +00:00
withchao
1b1027192d go.mod 2024-06-13 09:45:14 +08:00
chao
17dad5cf43
Merge branch 'openimsdk:main' into main 2024-06-12 14:42:26 +08:00
withchao
caebdf32ca sync 2024-06-11 18:38:36 +08:00
withchao
58c4c13cf1 sync 2024-06-07 17:45:41 +08:00
withchao
a1523f47e7 sync option 2024-06-06 15:28:03 +08:00
withchao
c5f565ff20 sync option 2024-06-06 09:57:47 +08:00
withchao
8e1d0c5a1f Merge remote-tracking branch 'origin/list' into list
# Conflicts:
#	internal/rpc/friend/black.go
#	internal/rpc/friend/callback.go
#	internal/rpc/friend/convert.go
#	internal/rpc/friend/friend.go
#	internal/rpc/friend/notification.go
#	internal/rpc/friend/sync.go
#	internal/rpc/user/user.go
2024-06-06 09:55:24 +08:00
withchao
6285b688a2 sync option 2024-06-06 09:45:44 +08:00
OpenIM-Gordon
93621695bf
Merge pull request #1 from mo3et/list
refactor: replace `friend` package with `realtion`.
2024-06-05 11:46:28 +08:00
Monet Lee
e11807c028 refactor: update lastest commit to relation. 2024-06-05 11:39:10 +08:00
Monet Lee
7821f5f265
Merge branch 'list' into list 2024-06-05 11:37:56 +08:00