Commit Graph

680 Commits (8f52080eeda67d0625f72d8055165f29b078a062)

Author SHA1 Message Date
Ryan Tharp d432e2a77b verifyUserObjectDeviceMap() and refactor out verifyPrimaryPubKeys() 6 years ago
Ryan Tharp 7f433f3df0 move file server related functions into file server, make multidevice states global 6 years ago
Ryan Tharp 206d29b033 avoid no pubkey with guards, make sure primary and secondary authorization match 6 years ago
Ryan Tharp 9ba641c8c1 signature checking, hide your own message, addres potential race issues 6 years ago
Ryan Tharp 87474d48b5 fix async problem with receive forEach, implement most of the annotation processing for multidevice 6 years ago
Ryan Tharp 7b22806bf0 Merge branch 'multi-device' of https://github.com/loki-project/loki-messenger into multidevice-publicchat 6 years ago
sachaaaaa 1f3311bc5d Save device mappings upon accepting friend request + various fixes 6 years ago
sachaaaaa 48ce9a7649 lint 6 years ago
sachaaaaa 03d0385427 Fix signatures being sent to file server as arraybuffer 6 years ago
sachaaaaa 73d90a5277
Merge pull request #537 from sachaaaaa/secondary_device_minimum_receiver
[multi-device] Start all the receivers only after the secondary registration is fini…
6 years ago
Ryan Tharp 468550cbdf getDeviceMappingForUsers() 6 years ago
Ryan Tharp ddde675ba8 stub out multidevice support, move token validation into server class 6 years ago
sachaaaaa c38e145be7 lint 6 years ago
sachaaaaa 634d274ffc
Merge pull request #531 from sachaaaaa/remove_all_private_conv
[multi-device] Remove private convs only
6 years ago
sachaaaaa cc04bee38a Start all the receivers only after the secondary registration is finished 6 years ago
sachaaaaa 8ce21b13fe Remove only private conversation during secondary registrations steps to keep public chats in db 6 years ago
sachaaaaa de6e4e4920 Add updateOurDeviceMapping that wraps setOurDeviceMapping 6 years ago
sachaaaaa 5a8ab00a96 Rename pairing getters to specify secondary or primary. Add getGrantAuthForPrimary. 6 years ago
sachaaaaa b63d8ec84f Merge branch 'clearnet' into multi-device
* clearnet: (35 commits)
  yarn lint
  return early if signature is not a string
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address review
  address reviews
  Custom message rendering of mentions
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  lint and remove unneeded params
  ...
6 years ago
sachaaaaa 7549c45716 yarn lint 6 years ago
sachaaaaa a28c581666 return early if signature is not a string 6 years ago
sachaaaaa a931b2491a Merge branch 'clearnet' into PR_file_server
* clearnet:
  lint pass 2
  lint pass 1
  make sure versioning on write can't get out of sync
  Update js/modules/loki_public_chat_api.js
  Handle annotations omit correctly
  fix typo CI found
  refactor
  pollOnceForMessages() move lastGot up, address Sacha's review
  Update js/modules/loki_public_chat_api.js
  address reviews
  Custom message rendering of mentions
  lint and remove unneeded params
  modernize annotations since we're making a backward-incomp change
  sign and only show verified messages

# Conflicts:
#	js/modules/loki_public_chat_api.js
6 years ago
sachaaaaa 035c48eb12
Merge pull request #517 from neuroscr/publicchat_signed
sign and only show verified public chat messages
6 years ago
Ryan Tharp 34b7117ff7
lint pass 2 6 years ago
Ryan Tharp 8bfb7f297d
lint pass 1 6 years ago
sachaaaaa b13a4f3e56
Merge pull request #520 from msgmaxim/mentions2
Custom message rendering of mentions
6 years ago
Ryan Tharp 6ac6d656a4
make sure versioning on write can't get out of sync 6 years ago
Ryan Tharp ab440a699f
Update js/modules/loki_public_chat_api.js
Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
6 years ago
Ryan Tharp a976388315
Handle annotations omit correctly 6 years ago
Ryan Tharp b62801bc2a
fix typo CI found 6 years ago
Ryan Tharp 968ad9227c
refactor
pls forgive, using github editor for expedience, untested changes
6 years ago
Ryan Tharp c8cf05558f
pollOnceForMessages() move lastGot up, address Sacha's review 6 years ago
Ryan Tharp d85cd980c2
Update js/modules/loki_public_chat_api.js
oof

Co-Authored-By: sachaaaaa <40749766+sachaaaaa@users.noreply.github.com>
6 years ago
sachaaaaa e2e2d1e845 address review 6 years ago
sachaaaaa 7756d4f0f3 Merge branch 'clearnet' into PR_file_server
* clearnet:
  fix method
  separate out new/open, more lint/cleanup
  separate out note to self
  create window.mixpanel here
  use window.mixpanel, remove eventEmitter
  allow mixpanel to be already set up elsewhere
  Address review comments
  Add missing file in tests
  Add UI elements for searching and selecting members in a group chat
  Desktop Analytics
  Replaced value with a descriptive constant.
  Add comment to fix up confusion.
  Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages.

# Conflicts:
#	js/background.js
#	js/modules/loki_public_chat_api.js
6 years ago
Ryan Tharp 71fde0b9e6
Merge branch 'clearnet' into publicchat_signed 6 years ago
sachaaaaa 155a3b8f17
Merge pull request #512 from neuroscr/desktop-analytics
Desktop Analytics
6 years ago
sachaaaaa a3d677819b
Merge pull request #508 from Mikunj/duplicate-message-fix
Public chat duplicate message fix
6 years ago
Maxim Shishmarev 687e9db77b Custom message rendering of mentions 6 years ago
Ryan Tharp 3150a6ce11 separate out new/open, more lint/cleanup 6 years ago
Ryan Tharp 51eaa90823 use window.mixpanel, remove eventEmitter 6 years ago
Ryan Tharp 68186afba2 lint and remove unneeded params 6 years ago
sachaaaaa 3b450e28da lint 6 years ago
sachaaaaa f8e9e1d3bd Remove rejected authorisation from database 6 years ago
sachaaaaa e07f81c150 Add LokiFileServerAPI 6 years ago
sachaaaaa dc6d3b5ca2 Add LokiPublicChatAPI (extends LokiAppDotNetAPI) 6 years ago
sachaaaaa 33ea259d45 Rename file 6 years ago
sachaaaaa fc00373897 Change LokiPublicChatAPI to LokiAppDotNetAPI, add annotations getter and setter 6 years ago
Ryan Tharp a97788c7d9 modernize annotations since we're making a backward-incomp change 6 years ago
Ryan Tharp a0b52826e9 sign and only show verified messages 6 years ago
Maxim Shishmarev 1496a368e9 Add UI elements for searching and selecting members in a group chat 6 years ago
Ryan Tharp 88b44390bf Desktop Analytics 6 years ago
sachaaaaa 0426d85e7a Merge branch 'clearnet' into multi-device
* clearnet: (136 commits)
  Fix more check on deletion.
  Only shorten pubkeys if name is present
  Shorten pubkeys in quotations too
  better guard
  pass serverId back to the server
  Bump version.
  Purge cache on failure.
  Fix unnecessary link preview fetches.
  Review changes. Increase mod time to 30 seconds.
  Undo defaultPublicChatServer change,
  Modified colour of dark mod badge
  Linting.
  Updated design
  Show crown icon for moderators
  Fix last hash all being NULL in database
  Poll for moderators, store them on the conversation and use the list to determine our own mod status
  Make sure we are always updating the last deleted id
  Update ts/components/conversation/FriendRequest.md
  Fix #355 Display timestamp for friend requests
  Fix duplicate detection for sent messages in public chat
  ...

# Conflicts:
#	app/sql.js
#	js/background.js
#	js/models/messages.js
#	js/views/app_view.js
#	libloki/crypto.js
#	libtextsecure/message_receiver.js
6 years ago
Mikunj 75a527e828 Replaced value with a descriptive constant. 6 years ago
Mikunj 001d882273 Add comment to fix up confusion. 6 years ago
Mikunj 19b0dabe11 Keep a cache of the last 5 fetched messages for public chat so we can use it to detect duplicate messages. 6 years ago
Mikunj 3152637cdc Fix more check on deletion. 6 years ago
Ryan Tharp ca5275b410 better guard 6 years ago
Ryan Tharp e6d22aab19 pass serverId back to the server 6 years ago
sachaaaaa d3c3184405 Search returns primary device when looking up secondary pub key 6 years ago
Mikunj e6d62cb22c Review changes.
Increase mod time to 30 seconds.
6 years ago
Mikunj 0b898612d9 Linting. 6 years ago
Mikunj 0883b1b650 Updated styles.
Merge commit clearnet into mod-badges
6 years ago
sachaaaaa 43976c6c43
Merge pull request #494 from sachaaaaa/fix_last_hash
Fix last hash all being NULL in database
6 years ago
Beaudan Campbell-Brown ec5a69f1cf
Merge pull request #489 from msgmaxim/replies
Enable quotes in public chats
6 years ago
sachaaaaa 3beb6004db Fix last hash all being NULL in database 6 years ago
Beaudan Brown 72b3d02b52 Poll for moderators, store them on the conversation and use the list to determine our own mod status 6 years ago
Beaudan Brown 97746307f0 Make sure we are always updating the last deleted id 6 years ago
Maxim Shishmarev 5cf63af3a3 Enable quotes in public chats 6 years ago
sachaaaaa b10835ffc7 Share contact upon authorising secondary device 6 years ago
Beaudan Brown 9beea2cbd3 Enforce curlies completely and lint with new settings 6 years ago
Beaudan Brown 6f995d6a96 Resolve linter issues 6 years ago
Beaudan Brown f9ca6e4cf2 Merge branch 'publicchat-config' of https://github.com/neuroscr/loki-messenger into neuroscr-publicchat-config 6 years ago
Beaudan Brown 0c870d04e3 Stop polling when leaving public chat, only grab the most recent 100 messages on first poll 6 years ago
Ryan Tharp 220f0aa9f5 handle empty servers better 6 years ago
Ryan Tharp eb3d22f2b0 remove unneeded comment 6 years ago
Ryan Tharp c97f26465c set correct name on conversation 6 years ago
Ryan Tharp 6d1c9700b1 this.stop guard on channelAPI 6 years ago
Ryan Tharp e382afdf91 make timers stoppable, delete throw parameter, pollForChannel() pattern update 6 years ago
Ryan Tharp f093490bec lint plus constant fix 6 years ago
Ryan Tharp 2ca23db141 Merge branch 'use-user-obj' of https://github.com/neuroscr/loki-messenger into use-user-obj 6 years ago
Ryan Tharp 5b193b9e47 remove throw for now, squash ifs, some future avatar notes 6 years ago
Ryan Tharp 35d059eae5 was getting some weird errors, going to try this 6 years ago
Ryan Tharp 3f35170eae
Merge branch 'clearnet' into use-user-obj 6 years ago
Ryan Tharp 428a3b7077 add back conversationId 6 years ago
Beaudan Brown da97d15891 Log when there are errors polling 6 years ago
Beaudan Brown 0dd180d4f4 Wrap polling function in try finally for safety, fix issue with empty array check and lint 6 years ago
Ryan Tharp e25ed0aba3 move pubkey/name out of annotation into user object, read channel meta data from server, throw alert if delete fails, constant name clean up, store timers, Calls refreshModStatus/pollForChannel in cstr 6 years ago
Beaudan Brown 8f4b0a2088 Don't look 6 years ago
sachaaaaa 35b6182074 Clean up after account registration failure 6 years ago
Beaudan Campbell-Brown 43bd167965
Merge pull request #463 from loki-project/public-chat
Public chat
6 years ago
Beaudan Brown cccf533abc Save conversation after all messages are processed 6 years ago
Beaudan Brown 27976a053c Save the last retrieved message for public chats on the conversation 6 years ago
Beaudan Campbell-Brown f4e76f0576
Merge pull request #455 from neuroscr/public-delete
Public delete
6 years ago
Beaudan Campbell-Brown 17c2817517
Merge pull request #449 from BeaudanBrown/rss-fix
Fix feed reader for single element results
6 years ago
Ryan Tharp 56a4a31ca2 sendMessage(), getOrRefreshServerToken supports forceRefresh, make modStatus a property, additional comments 6 years ago
Ryan Tharp dfd6039c83 use LokiPublicChannelAPI 6 years ago
Ryan Tharp 95cca859e9 Merge branch 'deletion-final' of https://github.com/BeaudanBrown/loki-messenger into public-delete 6 years ago
Beaudan Brown 8d77d6fd79 All the API updates, enable mod status retrieval and allow for message deletion 6 years ago
Beaudan Brown 1b4105a3d0 Fix db stuff and remove unneeded message function 6 years ago