martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-14 20:49:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into asset

Browse Source
This commit is contained in:
balzack 2023-04-27 21:30:54 -07:00
commit 1252e52dba
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -24,7 +24,7 @@ Databag is a self-hosted messaging service. Notable features include:
- Federated (accounts on different nodes can communicate) - Federated (accounts on different nodes can communicate)
- Public-Private key based identity (not bound to any blockchain or hosting domain) - Public-Private key based identity (not bound to any blockchain or hosting domain)
- End-to-End encryption (the hosting admin cannot view sealed topics, deafult unsealed) - End-to-End encryption (the hosting admin cannot view sealed topics, deafult unsealed)
- Audio and Video Calls (nat tranversal requires separate relay server) - Audio and Video Calls (nat traversal requires separate relay server)
- Topic based threads (messages organized by topic not contacts) - Topic based threads (messages organized by topic not contacts)
- Lightweight (server can run on a raspberry pi zero v1.3) - Lightweight (server can run on a raspberry pi zero v1.3)
- Low latency (use of websockets for push events to avoid polling) - Low latency (use of websockets for push events to avoid polling)

2
app/mobile/src/context/useAppContext.hook.js
View File

@ -48,7 +48,7 @@ export function useAppContext() {
} }
catch (err) { catch (err) {
console.log(err); console.log(err);
Alert.alert('FCM', err.toString()); //Alert.alert('FCM', err.toString());
} }
} }
catch (err) { catch (err) {

2
app/mobile/src/session/Session.jsx
View File

@ -216,7 +216,7 @@ function HomeScreen({ navParams }) {
</TouchableOpacity> </TouchableOpacity>
</View> </View>
<View style={styles.channels}> <View style={styles.channels}>
<Channels dmChannel={navParams.dmChannel} shareChannel={shareChannel} cardId={cardId} channelId={channelId} openConversation={setConversation} /> <Channels dmChannel={navParams.dmChannel} shareChannel={navParams.shareChannel} cardId={cardId} channelId={channelId} openConversation={setConversation} />
</View> </View>
</SafeAreaView> </SafeAreaView>
<View style={styles.conversation}> <View style={styles.conversation}>

2
app/mobile/src/session/conversation/addTopic/useAddTopic.hook.js
View File

@ -38,7 +38,7 @@ export function useAddTopic(contentKey) {
useEffect(() => { useEffect(() => {
let conflict = false; let conflict = false;
if (state.locked) { if (state.locked && state.assets.length > 0) {
conflict = true; conflict = true;
} }
state.assets.forEach(asset => { state.assets.forEach(asset => {