nostr/nostros
1
0
Fork 0
mirror of https://github.com/KoalaSat/nostros.git synced 2024-09-29 06:30:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
KoalaSat 2022-12-28 18:12:28 +01:00
parent 228b41a2ac
commit 12acf1495f
No known key found for this signature in database
GPG Key ID: 2F7F61C6146AB157
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/main/java/com/nostros/classes/Event.java
View File

@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
@ -210,7 +209,7 @@ public class Event {
values.put("name", userContent.optString("name")); values.put("name", userContent.optString("name"));
values.put("picture", userContent.optString("picture")); values.put("picture", userContent.optString("picture"));
values.put("about", userContent.optString("about")); values.put("about", userContent.optString("about"));
values.put("lnurl", userContent.optString("lnurl")); values.put("lnurl", userContent.optString("lud06"));
values.put("main_relay", userContent.optString("main_relay")); values.put("main_relay", userContent.optString("main_relay"));
values.put("created_at", created_at); values.put("created_at", created_at);
if (cursor.getCount() == 0) { if (cursor.getCount() == 0) {

2
frontend/Components/ConfigPage/index.tsx
View File

@ -66,7 +66,7 @@ export const ConfigPage: React.FC = () => {
name, name,
about, about,
picture, picture,
lnurl, lud06: lnurl,
}), }),
created_at: moment().unix(), created_at: moment().unix(),
kind: EventKind.meta, kind: EventKind.meta,

2
frontend/Components/HomePage/index.tsx
View File

@ -46,7 +46,7 @@ export const HomePage: React.FC = () => {
const message: RelayFilters = { const message: RelayFilters = {
kinds: [EventKind.textNote, EventKind.recommendServer], kinds: [EventKind.textNote, EventKind.recommendServer],
authors: users.map((user) => user.id), authors: [...users.map((user) => user.id), publicKey],
} }
if (lastNote && lastNotes.length > 0 && !past) { if (lastNote && lastNotes.length > 0 && !past) {

6
frontend/Functions/DatabaseFunctions/Notes/index.ts
View File

@ -45,10 +45,10 @@ export const getMentionNotes: (
nostros_notes.*, nostros_users.name, nostros_users.picture, nostros_users.contact FROM nostros_notes nostros_notes.*, nostros_users.name, nostros_users.picture, nostros_users.contact FROM nostros_notes
LEFT JOIN LEFT JOIN
nostros_users ON nostros_users.id = nostros_notes.pubkey nostros_users ON nostros_users.id = nostros_notes.pubkey
WHERE nostros_notes.reply_event_id IN ( WHERE (nostros_notes.reply_event_id IN (
SELECT nostros_notes.id FROM nostros_notes WHERE pubkey = '${pubKey}' SELECT nostros_notes.id FROM nostros_notes WHERE pubkey = '${pubKey}'
) ) OR nostros_notes.user_mentioned = 1)
OR user_mentioned = 1 AND nostros_notes.pubkey != '${pubKey}'
ORDER BY created_at DESC ORDER BY created_at DESC
LIMIT ${limit} LIMIT ${limit}
` `

16
frontend/Locales/ru.json
View File

@ -17,7 +17,7 @@
"search": "Поиск", "search": "Поиск",
"send": "Отправить", "send": "Отправить",
"noContacts": "У Вас пока нет контактов", "noContacts": "У Вас пока нет контактов",
"addContacts": "Añadir contactos" "addContacts": "Добавить контакты"
}, },
"logger": { "logger": {
"randomKeyGenerator": { "randomKeyGenerator": {
@ -38,13 +38,13 @@
"reply": "Ответить" "reply": "Ответить"
}, },
"loader": { "loader": {
"searchingProfile": "Buscando tu perfil", "searchingProfile": "Поиск профиля",
"profileFound": "Perfil encontrado", "profileFound": "Профиль найден",
"searchingContacts": "Buscando tus contactos:", "searchingContacts": "Поиск контактов:",
"help1": "¿Tienes problemas encontrando tus datos?", "help1": "Проблемы с подключением?",
"help2": "Intenta contectarte a otros Relays.", "help2": "Попробуйте подключиться к другим реле.",
"relays": "Relays", "relays": "Реле",
"home": "Ir a Home" "home": "На главную"
}, },
"configPage": { "configPage": {
"title": "Настройки", "title": "Настройки",