renaming bounce to cwtch.im/app

This commit is contained in:
erinn 2018-11-28 14:14:02 -08:00
parent fe5f83c3f7
commit ae7e3e5c4e
13 changed files with 73 additions and 78 deletions

View File

@ -1,9 +1,9 @@
package characters
import (
"bounce/go/gobjects"
"bounce/go/the"
"cwtch.im/cwtch/model"
"cwtch.im/ui/go/gobjects"
"cwtch.im/ui/go/the"
)
func CwtchListener(callback func(message *gobjects.Message), groupID string, channel chan model.Message) {

View File

@ -1,9 +1,9 @@
package characters
import (
"cwtch.im/ui/go/gobjects"
"cwtch.im/ui/go/the"
"time"
"bounce/go/the"
"bounce/go/gobjects"
)
func GroupPoller(getContact func(string) *gobjects.Contact, updateContact func(string)) {

View File

@ -1,10 +1,10 @@
package characters
import (
"bounce/go/the"
"cwtch.im/ui/go/gobjects"
"cwtch.im/ui/go/the"
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
"log"
"bounce/go/gobjects"
)
func PostmanPat(messages chan gobjects.Letter) {

View File

@ -1,10 +1,10 @@
package characters
import (
"cwtch.im/ui/go/cwutil"
"cwtch.im/ui/go/gobjects"
"cwtch.im/ui/go/the"
"time"
"bounce/go/the"
"bounce/go/cwutil"
"bounce/go/gobjects"
)
func PresencePoller(getContact func(string) *gobjects.Contact, addContact func(contact *gobjects.Contact), updateContact func(string)) { // TODO: make this subscribe-able in ricochet

View File

@ -1,12 +1,8 @@
package characters
import (
"git.openprivacy.ca/openprivacy/asaur"
"strconv"
"time"
)
func TorStatusPoller(setTorStatus func(int, string)) {
//TODO: convert this from asaur to bine
/*
for {
time.Sleep(time.Second)
//todo: this should use a config manager
@ -32,4 +28,5 @@ func TorStatusPoller(setTorStatus func(int, string)) {
setTorStatus(2, status["SUMMARY"])
}
*/
}

View File

@ -1,12 +1,12 @@
package cwtchthings
import (
"cwtch.im/ui/go/cwutil"
"cwtch.im/ui/go/gobjects"
"cwtch.im/ui/go/the"
"git.openprivacy.ca/openprivacy/libricochet-go/application"
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
"time"
"bounce/go/the"
"bounce/go/cwutil"
"bounce/go/gobjects"
)
type ChatChannelListener struct {

View File

@ -5,4 +5,3 @@ type Letter struct {
To, Message string
MID uint
}

View File

@ -1,19 +1,19 @@
package gothings
import (
"bounce/go/constants"
"bounce/go/cwutil"
"cwtch.im/ui/go/constants"
"cwtch.im/ui/go/cwutil"
"cwtch.im/cwtch/model"
"cwtch.im/ui/go/characters"
"cwtch.im/ui/go/gobjects"
"cwtch.im/ui/go/the"
"encoding/base32"
"fmt"
"github.com/therecipe/qt/core"
"log"
"strings"
"time"
"bounce/go/the"
"cwtch.im/cwtch/model"
"bounce/go/characters"
"bounce/go/gobjects"
)
type GrandCentralDispatcher struct {

View File

@ -1,10 +1,10 @@
package gothings
import (
"bounce/go/constants"
"bounce/go/gobjects"
"bounce/go/the"
"cwtch.im/cwtch/model"
"cwtch.im/ui/go/constants"
"cwtch.im/ui/go/gobjects"
"cwtch.im/ui/go/the"
"encoding/base32"
"log"
"strings"

View File

@ -1,9 +1,9 @@
package the
import (
libPeer "cwtch.im/cwtch/peer"
"cwtch.im/cwtch/app"
)
libPeer "cwtch.im/cwtch/peer"
)
var CwtchApp app.Application
var Peer libPeer.CwtchPeer

15
main.go
View File

@ -1,14 +1,18 @@
package main
import (
"bounce/go/characters"
"bounce/go/cwutil"
"bounce/go/the"
libapp "cwtch.im/cwtch/app"
"cwtch.im/cwtch/model"
"cwtch.im/ui/go/characters"
"cwtch.im/ui/go/cwtchthings"
"cwtch.im/ui/go/cwutil"
"cwtch.im/ui/go/gobjects"
"cwtch.im/ui/go/gothings"
"cwtch.im/ui/go/the"
"fmt"
"git.openprivacy.ca/openprivacy/libricochet-go/application"
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
"git.openprivacy.ca/openprivacy/libricochet-go/connectivity"
"github.com/therecipe/qt/core"
"github.com/therecipe/qt/quick"
"github.com/therecipe/qt/quickcontrols2"
@ -17,10 +21,6 @@ import (
"os"
"os/user"
"path"
"bounce/go/cwtchthings"
"bounce/go/gothings"
"bounce/go/gobjects"
"git.openprivacy.ca/openprivacy/libricochet-go/connectivity"
)
func init() {
@ -145,7 +145,6 @@ func loadCwtchData(gcd *gothings.GrandCentralDispatcher) {
the.Peer.SetApplicationInstanceFactory(aif)
the.CwtchApp.LaunchPeers()
contacts := the.Peer.GetContacts()
for i := range contacts {
contact, _ := the.Peer.GetProfile().GetContact(contacts[i])