mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 09:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

snakecase to camelcase

Browse source 
Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
This commit is contained in:
Paul Tötterman 2017-10-15 17:49:52 +03:00
parent 7623439bdc
commit a21acae5a8
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/devices_table.go
View file

@ -154,14 +154,14 @@ func (s *devicesStatements) selectDeviceByToken(
} }
func (s *devicesStatements) selectDeviceByID( func (s *devicesStatements) selectDeviceByID(
ctx context.Context, localpart, device_id string, ctx context.Context, localpart, deviceID string,
) (*authtypes.Device, error) { ) (*authtypes.Device, error) {
var dev authtypes.Device var dev authtypes.Device
var created int64 var created int64
stmt := s.selectDeviceByIDStmt stmt := s.selectDeviceByIDStmt
err := stmt.QueryRowContext(ctx, localpart, device_id).Scan(&created) err := stmt.QueryRowContext(ctx, localpart, deviceID).Scan(&created)
if err == nil { if err == nil {
dev.ID = device_id dev.ID = deviceID
dev.UserID = makeUserID(localpart, s.serverName) dev.UserID = makeUserID(localpart, s.serverName)
} }
return &dev, err return &dev, err

4
src/github.com/matrix-org/dendrite/clientapi/auth/storage/devices/storage.go
View file

@ -55,9 +55,9 @@ func (d *Database) GetDeviceByAccessToken(
// GetDeviceByID returns the device matching the given ID. // GetDeviceByID returns the device matching the given ID.
// Returns sql.ErrNoRows if no matching device was found. // Returns sql.ErrNoRows if no matching device was found.
func (d *Database) GetDeviceByID( func (d *Database) GetDeviceByID(
ctx context.Context, localpart, device_id string, ctx context.Context, localpart, deviceID string,
) (*authtypes.Device, error) { ) (*authtypes.Device, error) {
return d.devices.selectDeviceByID(ctx, localpart, device_id) return d.devices.selectDeviceByID(ctx, localpart, deviceID)
} }
// GetDevicesByLocalpart returns the devices matching the given localpart. // GetDevicesByLocalpart returns the devices matching the given localpart.

4
src/github.com/matrix-org/dendrite/clientapi/routing/device.go
View file

@ -38,7 +38,7 @@ type devicesJSON struct {
// GetDeviceByID handles /device/{deviceID} // GetDeviceByID handles /device/{deviceID}
func GetDeviceByID( func GetDeviceByID(
req *http.Request, deviceDB *devices.Database, device *authtypes.Device, req *http.Request, deviceDB *devices.Database, device *authtypes.Device,
device_id string, deviceID string,
) util.JSONResponse { ) util.JSONResponse {
localpart, _, err := gomatrixserverlib.SplitID('@', device.UserID) localpart, _, err := gomatrixserverlib.SplitID('@', device.UserID)
if err != nil { if err != nil {
@ -46,7 +46,7 @@ func GetDeviceByID(
} }
ctx := req.Context() ctx := req.Context()
dev, err := deviceDB.GetDeviceByID(ctx, localpart, device_id) dev, err := deviceDB.GetDeviceByID(ctx, localpart, deviceID)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return util.JSONResponse{ return util.JSONResponse{
Code: 404, Code: 404,