watsonb8/groupme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use type aliases for different ID types and add puppet type

Browse Source
This commit is contained in:
Tulir Asokan
2018-08-17 00:11:28 +03:00
parent 141eba644b
commit edd4f817e4
13 changed files with 325 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
database/portal.go
View File

@ -18,6 +18,7 @@ package database
import (
log "maunium.net/go/maulogger"
"maunium.net/go/mautrix-whatsapp/types"
)
type PortalQuery struct {
@ -44,7 +45,7 @@ func (pq *PortalQuery) New() *Portal {
}
}
func (pq *PortalQuery) GetAll(owner string) (portals []*Portal) {
func (pq *PortalQuery) GetAll(owner types.MatrixUserID) (portals []*Portal) {
rows, err := pq.db.Query("SELECT * FROM portal WHERE owner=?", owner)
if err != nil || rows == nil {
return nil
@ -56,11 +57,11 @@ func (pq *PortalQuery) GetAll(owner string) (portals []*Portal) {
return
}
func (pq *PortalQuery) GetByJID(owner, jid string) *Portal {
func (pq *PortalQuery) GetByJID(owner types.MatrixUserID, jid types.WhatsAppID) *Portal {
return pq.get("SELECT * FROM portal WHERE jid=? AND owner=?", jid, owner)
}
func (pq *PortalQuery) GetByMXID(mxid string) *Portal {
func (pq *PortalQuery) GetByMXID(mxid types.MatrixRoomID) *Portal {
return pq.get("SELECT * FROM portal WHERE mxid=?", mxid)
}
@ -76,9 +77,9 @@ type Portal struct {
db *Database
log log.Logger
JID string
MXID string
Owner string
JID types.WhatsAppID
MXID types.MatrixRoomID
Owner types.MatrixUserID
}
func (portal *Portal) Scan(row Scannable) *Portal {

11
database/puppet.go
View File

@ -18,6 +18,7 @@ package database
import (
log "maunium.net/go/maulogger"
"maunium.net/go/mautrix-whatsapp/types"
)
type PuppetQuery struct {
@ -45,8 +46,8 @@ func (pq *PuppetQuery) New() *Puppet {
}
}
func (pq *PuppetQuery) GetAll() (puppets []*Puppet) {
rows, err := pq.db.Query("SELECT * FROM puppet")
func (pq *PuppetQuery) GetAll(receiver types.MatrixUserID) (puppets []*Puppet) {
rows, err := pq.db.Query("SELECT * FROM puppet WHERE receiver=%s")
if err != nil || rows == nil {
return nil
}
@ -57,7 +58,7 @@ func (pq *PuppetQuery) GetAll() (puppets []*Puppet) {
return
}
func (pq *PuppetQuery) Get(jid, receiver string) *Puppet {
func (pq *PuppetQuery) Get(jid types.WhatsAppID, receiver types.MatrixUserID) *Puppet {
row := pq.db.QueryRow("SELECT * FROM user WHERE jid=? AND receiver=?", jid, receiver)
if row == nil {
return nil
@ -69,8 +70,8 @@ type Puppet struct {
db *Database
log log.Logger
JID string
Receiver string
JID types.WhatsAppID
Receiver types.MatrixUserID
Displayname string
Avatar string

7
database/user.go
View File

@ -19,6 +19,7 @@ package database
import (
log "maunium.net/go/maulogger"
"github.com/Rhymen/go-whatsapp"
"maunium.net/go/mautrix-whatsapp/types"
)
type UserQuery struct {
@ -61,7 +62,7 @@ func (uq *UserQuery) GetAll() (users []*User) {
return
}
func (uq *UserQuery) Get(userID string) *User {
func (uq *UserQuery) Get(userID types.MatrixUserID) *User {
row := uq.db.QueryRow("SELECT * FROM user WHERE mxid=?", userID)
if row == nil {
return nil
@ -73,8 +74,8 @@ type User struct {
db *Database
log log.Logger
UserID string
ManagementRoom string
UserID types.MatrixUserID
ManagementRoom types.MatrixRoomID
Session *whatsapp.Session
}