renaming bounce to cwtch.im/app
This commit is contained in:
parent
fe5f83c3f7
commit
ae7e3e5c4e
|
@ -1,9 +1,9 @@
|
||||||
package characters
|
package characters
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bounce/go/gobjects"
|
|
||||||
"bounce/go/the"
|
|
||||||
"cwtch.im/cwtch/model"
|
"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) {
|
func CwtchListener(callback func(message *gobjects.Message), groupID string, channel chan model.Message) {
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package characters
|
package characters
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"cwtch.im/ui/go/gobjects"
|
||||||
|
"cwtch.im/ui/go/the"
|
||||||
"time"
|
"time"
|
||||||
"bounce/go/the"
|
|
||||||
"bounce/go/gobjects"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func GroupPoller(getContact func(string) *gobjects.Contact, updateContact func(string)) {
|
func GroupPoller(getContact func(string) *gobjects.Contact, updateContact func(string)) {
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package characters
|
package characters
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bounce/go/the"
|
"cwtch.im/ui/go/gobjects"
|
||||||
|
"cwtch.im/ui/go/the"
|
||||||
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"log"
|
"log"
|
||||||
"bounce/go/gobjects"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func PostmanPat(messages chan gobjects.Letter) {
|
func PostmanPat(messages chan gobjects.Letter) {
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package characters
|
package characters
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"cwtch.im/ui/go/cwutil"
|
||||||
|
"cwtch.im/ui/go/gobjects"
|
||||||
|
"cwtch.im/ui/go/the"
|
||||||
"time"
|
"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
|
func PresencePoller(getContact func(string) *gobjects.Contact, addContact func(contact *gobjects.Contact), updateContact func(string)) { // TODO: make this subscribe-able in ricochet
|
||||||
|
|
|
@ -1,12 +1,8 @@
|
||||||
package characters
|
package characters
|
||||||
|
|
||||||
import (
|
|
||||||
"git.openprivacy.ca/openprivacy/asaur"
|
|
||||||
"strconv"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TorStatusPoller(setTorStatus func(int, string)) {
|
func TorStatusPoller(setTorStatus func(int, string)) {
|
||||||
|
//TODO: convert this from asaur to bine
|
||||||
|
/*
|
||||||
for {
|
for {
|
||||||
time.Sleep(time.Second)
|
time.Sleep(time.Second)
|
||||||
//todo: this should use a config manager
|
//todo: this should use a config manager
|
||||||
|
@ -32,4 +28,5 @@ func TorStatusPoller(setTorStatus func(int, string)) {
|
||||||
|
|
||||||
setTorStatus(2, status["SUMMARY"])
|
setTorStatus(2, status["SUMMARY"])
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
package cwtchthings
|
package cwtchthings
|
||||||
|
|
||||||
import (
|
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/application"
|
||||||
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
"time"
|
"time"
|
||||||
"bounce/go/the"
|
|
||||||
"bounce/go/cwutil"
|
|
||||||
"bounce/go/gobjects"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type ChatChannelListener struct {
|
type ChatChannelListener struct {
|
||||||
|
|
|
@ -5,4 +5,3 @@ type Letter struct {
|
||||||
To, Message string
|
To, Message string
|
||||||
MID uint
|
MID uint
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
package gothings
|
package gothings
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bounce/go/constants"
|
"cwtch.im/ui/go/constants"
|
||||||
"bounce/go/cwutil"
|
"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"
|
"encoding/base32"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/therecipe/qt/core"
|
"github.com/therecipe/qt/core"
|
||||||
"log"
|
"log"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
"bounce/go/the"
|
|
||||||
"cwtch.im/cwtch/model"
|
|
||||||
"bounce/go/characters"
|
|
||||||
"bounce/go/gobjects"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type GrandCentralDispatcher struct {
|
type GrandCentralDispatcher struct {
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
package gothings
|
package gothings
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bounce/go/constants"
|
|
||||||
"bounce/go/gobjects"
|
|
||||||
"bounce/go/the"
|
|
||||||
"cwtch.im/cwtch/model"
|
"cwtch.im/cwtch/model"
|
||||||
|
"cwtch.im/ui/go/constants"
|
||||||
|
"cwtch.im/ui/go/gobjects"
|
||||||
|
"cwtch.im/ui/go/the"
|
||||||
"encoding/base32"
|
"encoding/base32"
|
||||||
"log"
|
"log"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package the
|
package the
|
||||||
|
|
||||||
import (
|
import (
|
||||||
libPeer "cwtch.im/cwtch/peer"
|
|
||||||
"cwtch.im/cwtch/app"
|
"cwtch.im/cwtch/app"
|
||||||
)
|
libPeer "cwtch.im/cwtch/peer"
|
||||||
|
)
|
||||||
|
|
||||||
var CwtchApp app.Application
|
var CwtchApp app.Application
|
||||||
var Peer libPeer.CwtchPeer
|
var Peer libPeer.CwtchPeer
|
||||||
|
|
15
main.go
15
main.go
|
@ -1,14 +1,18 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bounce/go/characters"
|
|
||||||
"bounce/go/cwutil"
|
|
||||||
"bounce/go/the"
|
|
||||||
libapp "cwtch.im/cwtch/app"
|
libapp "cwtch.im/cwtch/app"
|
||||||
"cwtch.im/cwtch/model"
|
"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"
|
"fmt"
|
||||||
"git.openprivacy.ca/openprivacy/libricochet-go/application"
|
"git.openprivacy.ca/openprivacy/libricochet-go/application"
|
||||||
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
"git.openprivacy.ca/openprivacy/libricochet-go/channels"
|
||||||
|
"git.openprivacy.ca/openprivacy/libricochet-go/connectivity"
|
||||||
"github.com/therecipe/qt/core"
|
"github.com/therecipe/qt/core"
|
||||||
"github.com/therecipe/qt/quick"
|
"github.com/therecipe/qt/quick"
|
||||||
"github.com/therecipe/qt/quickcontrols2"
|
"github.com/therecipe/qt/quickcontrols2"
|
||||||
|
@ -17,10 +21,6 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"os/user"
|
"os/user"
|
||||||
"path"
|
"path"
|
||||||
"bounce/go/cwtchthings"
|
|
||||||
"bounce/go/gothings"
|
|
||||||
"bounce/go/gobjects"
|
|
||||||
"git.openprivacy.ca/openprivacy/libricochet-go/connectivity"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -145,7 +145,6 @@ func loadCwtchData(gcd *gothings.GrandCentralDispatcher) {
|
||||||
the.Peer.SetApplicationInstanceFactory(aif)
|
the.Peer.SetApplicationInstanceFactory(aif)
|
||||||
the.CwtchApp.LaunchPeers()
|
the.CwtchApp.LaunchPeers()
|
||||||
|
|
||||||
|
|
||||||
contacts := the.Peer.GetContacts()
|
contacts := the.Peer.GetContacts()
|
||||||
for i := range contacts {
|
for i := range contacts {
|
||||||
contact, _ := the.Peer.GetProfile().GetContact(contacts[i])
|
contact, _ := the.Peer.GetProfile().GetContact(contacts[i])
|
||||||
|
|
Reference in New Issue