Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 21:34:51 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into rav/get_devices_api

Browse source 
(pick up PR #938 in the hope of fixing the UTs)
This commit is contained in:
Richard van der Hoff 2016-07-20 17:40:00 +01:00
commit 7314bf4682
6 changed files with 86 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/storage/client_ips.py
View file

@ -38,7 +38,7 @@ class ClientIpStore(SQLBaseStore):
super(ClientIpStore, self).__init__(hs)
@defer.inlineCallbacks
def insert_client_ip(self, user, access_token, ip, user_agent):
def insert_client_ip(self, user, access_token, ip, user_agent, device_id):
now = int(self._clock.time_msec())
key = (user.to_string(), access_token, ip)
@ -62,6 +62,7 @@ class ClientIpStore(SQLBaseStore):
"access_token": access_token,
"ip": ip,
"user_agent": user_agent,
"device_id": device_id,
},
values={
"last_seen": now,