7 changed files with 52 additions and 136 deletions
--- a/2
+++ b/2
@ -7,7 +7,7 @@ VERSION_CODE := 30
 VERSION_NUMBER := 0.0.25-wip
 VERSION_NAME := This program kills fascists.

-SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3470100.zip
+SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3470000.zip
 BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
 APPIMAGETOOL_URL := https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
 APPIMAGETOOL_MD5 := e989fadfc4d685fd3d6aeeb9b525d74d  out/appimagetool
--- a/deps/sqlite/shell.c
+++ b/deps/sqlite/shell.c
@ -460,7 +460,7 @@ char *sqlite3_fgets(char *buf, int sz, FILE *in){
    ** that into UTF-8.  Otherwise, non-ASCII characters all get translated
    ** into '?'.
    */
-    wchar_t *b1 = sqlite3_malloc( sz*sizeof(wchar_t) );
+    wchar_t *b1 = malloc( sz*sizeof(wchar_t) );
    if( b1==0 ) return 0;
    _setmode(_fileno(in), IsConsole(in) ? _O_WTEXT : _O_U8TEXT);
    if( fgetws(b1, sz/4, in)==0 ){
@ -526,7 +526,7 @@ int sqlite3_fputs(const char *z, FILE *out){
    ** use O_U8TEXT for everything in text mode.
    */
    int sz = (int)strlen(z);
-    wchar_t *b1 = sqlite3_malloc( (sz+1)*sizeof(wchar_t) );
+    wchar_t *b1 = malloc( (sz+1)*sizeof(wchar_t) );
    if( b1==0 ) return 0;
    sz = MultiByteToWideChar(CP_UTF8, 0, z, sz, b1, sz);
    b1[sz] = 0;
@ -6833,7 +6833,7 @@ static int seriesBestIndex(
      continue;
    }
    if( pConstraint->iColumn<SERIES_COLUMN_START ){
-      if( pConstraint->iColumn==SERIES_COLUMN_VALUE && pConstraint->usable ){
+      if( pConstraint->iColumn==SERIES_COLUMN_VALUE ){
        switch( op ){
          case SQLITE_INDEX_CONSTRAINT_EQ:
          case SQLITE_INDEX_CONSTRAINT_IS: {
@ -6841,9 +6841,7 @@ static int seriesBestIndex(
            idxNum &= ~0x3300;
            aIdx[5] = i;
            aIdx[6] = -1;
-#ifndef ZERO_ARGUMENT_GENERATE_SERIES
            bStartSeen = 1;
-#endif
            break;
          }
          case SQLITE_INDEX_CONSTRAINT_GE: {
@ -6851,9 +6849,7 @@ static int seriesBestIndex(
            idxNum |=  0x0100;
            idxNum &= ~0x0200;
            aIdx[5] = i;
-#ifndef ZERO_ARGUMENT_GENERATE_SERIES
            bStartSeen = 1;
-#endif
            break;
          }
          case SQLITE_INDEX_CONSTRAINT_GT: {
@ -6861,9 +6857,7 @@ static int seriesBestIndex(
            idxNum |=  0x0200;
            idxNum &= ~0x0100;
            aIdx[5] = i;
-#ifndef ZERO_ARGUMENT_GENERATE_SERIES
            bStartSeen = 1;
-#endif
            break;
          }
          case SQLITE_INDEX_CONSTRAINT_LE: {
@ -14175,7 +14169,7 @@ static int idxCreateVtabSchema(sqlite3expert *p, char **pzErrmsg){
    }else{
      IdxTable *pTab;
      rc = idxGetTableInfo(p->db, zName, &pTab, pzErrmsg);
-      if( rc==SQLITE_OK && ALWAYS(pTab!=0) ){
+      if( rc==SQLITE_OK ){
        int i;
        char *zInner = 0;
        char *zOuter = 0;
@ -31846,6 +31840,7 @@ static QuickScanState quickscan(char *zLine, QuickScanState qss,
  char cWait = (char)qss; /* intentional narrowing loss */
  if( cWait==0 ){
  PlainScan:
+    assert( cWait==0 );
    while( (cin = *zLine++)!=0 ){
      if( IsSpace(cin) )
        continue;
@ -31897,6 +31892,7 @@ static QuickScanState quickscan(char *zLine, QuickScanState qss,
          if( *zLine != '/' )
            continue;
          ++zLine;
+          cWait = 0;
          CONTINUE_PROMPT_AWAITC(pst, 0);
          qss = QSS_SETV(qss, 0);
          goto PlainScan;
@ -31908,6 +31904,7 @@ static QuickScanState quickscan(char *zLine, QuickScanState qss,
          }
          deliberate_fall_through;
        case ']':
+          cWait = 0;
          CONTINUE_PROMPT_AWAITC(pst, 0);
          qss = QSS_SETV(qss, 0);
          goto PlainScan;
--- a/deps/sqlite/sqlite3.c
+++ b/deps/sqlite/sqlite3.c
@ -1,6 +1,6 @@
 /******************************************************************************
 ** This file is an amalgamation of many separate C source files from SQLite
-** version 3.47.1.  By combining all the individual C code files into this
+** version 3.47.0.  By combining all the individual C code files into this
 ** single large file, the entire code can be compiled as a single translation
 ** unit.  This allows many compilers to do optimizations that would not be
 ** possible if the files were compiled separately.  Performance improvements
@ -18,7 +18,7 @@
 ** separate file. This file contains only code for the core SQLite library.
 **
 ** The content in this amalgamation comes from Fossil check-in
-** b95d11e958643b969c47a8e5857f3793b9e6.
+** 03a9703e27c44437c39363d0baf82db4ebc9.
 */
 #define SQLITE_CORE 1
 #define SQLITE_AMALGAMATION 1
@ -462,9 +462,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.47.1"
-#define SQLITE_VERSION_NUMBER 3047001
-#define SQLITE_SOURCE_ID      "2024-11-25 12:07:48 b95d11e958643b969c47a8e5857f3793b9e69700b8f1469371386369a26e577e"
+#define SQLITE_VERSION        "3.47.0"
+#define SQLITE_VERSION_NUMBER 3047000
+#define SQLITE_SOURCE_ID      "2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e"

 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@ -968,13 +968,6 @@ SQLITE_API int sqlite3_exec(
 ** filesystem supports doing multiple write operations atomically when those
 ** write operations are bracketed by [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] and
 ** [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].
-**
-** The SQLITE_IOCAP_SUBPAGE_READ property means that it is ok to read
-** from the database file in amounts that are not a multiple of the
-** page size and that do not begin at a page boundary.  Without this
-** property, SQLite is careful to only do full-page reads and write
-** on aligned pages, with the one exception that it will do a sub-page
-** read of the first page to access the database header.
 */
 #define SQLITE_IOCAP_ATOMIC                 0x00000001
 #define SQLITE_IOCAP_ATOMIC512              0x00000002
@ -991,7 +984,6 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
 #define SQLITE_IOCAP_IMMUTABLE              0x00002000
 #define SQLITE_IOCAP_BATCH_ATOMIC           0x00004000
-#define SQLITE_IOCAP_SUBPAGE_READ           0x00008000

 /*
 ** CAPI3REF: File Locking Levels
@ -1138,7 +1130,6 @@ struct sqlite3_file {
 ** <li> [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
 ** <li> [SQLITE_IOCAP_IMMUTABLE]
 ** <li> [SQLITE_IOCAP_BATCH_ATOMIC]
-** <li> [SQLITE_IOCAP_SUBPAGE_READ]
 ** </ul>
 **
 ** The SQLITE_IOCAP_ATOMIC property means that all writes of
@ -32307,7 +32298,6 @@ SQLITE_PRIVATE void sqlite3RecordErrorOffsetOfExpr(sqlite3 *db, const Expr *pExp
    pExpr = pExpr->pLeft;
  }
  if( pExpr==0 ) return;
-  if( ExprHasProperty(pExpr, EP_FromDDL) ) return;
  db->errByteOffset = pExpr->w.iOfst;
 }

@ -42601,7 +42591,6 @@ static void setDeviceCharacteristics(unixFile *pFd){
    if( pFd->ctrlFlags & UNIXFILE_PSOW ){
      pFd->deviceCharacteristics |= SQLITE_IOCAP_POWERSAFE_OVERWRITE;
    }
-    pFd->deviceCharacteristics |= SQLITE_IOCAP_SUBPAGE_READ;

    pFd->sectorSize = SQLITE_DEFAULT_SECTOR_SIZE;
  }
@ -50402,7 +50391,7 @@ static int winSectorSize(sqlite3_file *id){
 */
 static int winDeviceCharacteristics(sqlite3_file *id){
  winFile *p = (winFile*)id;
-  return SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN | SQLITE_IOCAP_SUBPAGE_READ |
+  return SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN |
         ((p->ctrlFlags & WINFILE_PSOW)?SQLITE_IOCAP_POWERSAFE_OVERWRITE:0);
 }

@ -51790,7 +51779,7 @@ static int winOpen(

  int rc = SQLITE_OK;            /* Function Return Code */
 #if !defined(NDEBUG) || SQLITE_OS_WINCE
-  int eType = flags&0x0FFF00;  /* Type of file to open */
+  int eType = flags&0xFFFFFF00;  /* Type of file to open */
 #endif

  int isExclusive  = (flags & SQLITE_OPEN_EXCLUSIVE);
@ -58010,26 +57999,18 @@ static const unsigned char aJournalMagic[] = {
 ** Return true if page pgno can be read directly from the database file
 ** by the b-tree layer. This is the case if:
 **
-**   (1)  the database file is open
-**   (2)  the VFS for the database is able to do unaligned sub-page reads
-**   (3)  there are no dirty pages in the cache, and
-**   (4)  the desired page is not currently in the wal file.
+**   * the database file is open,
+**   * there are no dirty pages in the cache, and
+**   * the desired page is not currently in the wal file.
 */
 SQLITE_PRIVATE int sqlite3PagerDirectReadOk(Pager *pPager, Pgno pgno){
-  assert( pPager!=0 );
-  assert( pPager->fd!=0 );
-  if( pPager->fd->pMethods==0 ) return 0;  /* Case (1) */
-  assert( pPager->fd->pMethods->xDeviceCharacteristics!=0 );
-  if( (pPager->fd->pMethods->xDeviceCharacteristics(pPager->fd)
-        & SQLITE_IOCAP_SUBPAGE_READ)==0 ){
-    return 0; /* Case (2) */
-  }
-  if( sqlite3PCacheIsDirty(pPager->pPCache) ) return 0; /* Failed (3) */
+  if( pPager->fd->pMethods==0 ) return 0;
+  if( sqlite3PCacheIsDirty(pPager->pPCache) ) return 0;
 #ifndef SQLITE_OMIT_WAL
  if( pPager->pWal ){
    u32 iRead = 0;
    (void)sqlite3WalFindFrame(pPager->pWal, pgno, &iRead);
-    return iRead==0; /* Condition (4) */
+    return iRead==0;
  }
 #endif
  return 1;
@ -158958,7 +158939,6 @@ static Expr *removeUnindexableInClauseTerms(
        pNew->pLeft->x.pList = pLhs;
      }
      pSelect->pEList = pRhs;
-      pSelect->selId = ++pParse->nSelect; /* Req'd for SubrtnSig validity */
      if( pLhs && pLhs->nExpr==1 ){
        /* Take care here not to generate a TK_VECTOR containing only a
        ** single value. Since the parser never creates such a vector, some
@ -189818,15 +189798,10 @@ static int fts3PoslistPhraseMerge(
  if( *p1==POS_COLUMN ){
    p1++;
    p1 += fts3GetVarint32(p1, &iCol1);
-    /* iCol1==0 indicates corruption. Column 0 does not have a POS_COLUMN
-    ** entry, so this is actually end-of-doclist. */
-    if( iCol1==0 ) return 0;
  }
  if( *p2==POS_COLUMN ){
    p2++;
    p2 += fts3GetVarint32(p2, &iCol2);
-    /* As above, iCol2==0 indicates corruption. */
-    if( iCol2==0 ) return 0;
  }

  while( 1 ){
@ -192997,7 +192972,7 @@ static int fts3EvalNearTest(Fts3Expr *pExpr, int *pRc){
      nTmp += p->pRight->pPhrase->doclist.nList;
    }
    nTmp += p->pPhrase->doclist.nList;
-    aTmp = sqlite3_malloc64(nTmp*2 + FTS3_VARINT_MAX);
+    aTmp = sqlite3_malloc64(nTmp*2);
    if( !aTmp ){
      *pRc = SQLITE_NOMEM;
      res = 0;
@ -194550,11 +194525,10 @@ static int getNextString(
        Fts3PhraseToken *pToken;

        p = fts3ReallocOrFree(p, nSpace + ii*sizeof(Fts3PhraseToken));
+        if( !p ) goto no_mem;
+
        zTemp = fts3ReallocOrFree(zTemp, nTemp + nByte);
-        if( !zTemp || !p ){
-          rc = SQLITE_NOMEM;
-          goto getnextstring_out;
-        }
+        if( !zTemp ) goto no_mem;

        assert( nToken==ii );
        pToken = &((Fts3Phrase *)(&p[1]))->aToken[ii];
@ -194569,6 +194543,9 @@ static int getNextString(
        nToken = ii+1;
      }
    }
+
+    pModule->xClose(pCursor);
+    pCursor = 0;
  }

  if( rc==SQLITE_DONE ){
@ -194576,10 +194553,7 @@ static int getNextString(
    char *zBuf = 0;

    p = fts3ReallocOrFree(p, nSpace + nToken*sizeof(Fts3PhraseToken) + nTemp);
-    if( !p ){
-      rc = SQLITE_NOMEM;
-      goto getnextstring_out;
-    }
+    if( !p ) goto no_mem;
    memset(p, 0, (char *)&(((Fts3Phrase *)&p[1])->aToken[0])-(char *)p);
    p->eType = FTSQUERY_PHRASE;
    p->pPhrase = (Fts3Phrase *)&p[1];
@ -194587,9 +194561,11 @@ static int getNextString(
    p->pPhrase->nToken = nToken;

    zBuf = (char *)&p->pPhrase->aToken[nToken];
-    assert( nTemp==0 || zTemp );
    if( zTemp ){
      memcpy(zBuf, zTemp, nTemp);
+      sqlite3_free(zTemp);
+    }else{
+      assert( nTemp==0 );
    }

    for(jj=0; jj<p->pPhrase->nToken; jj++){
@ -194599,17 +194575,17 @@ static int getNextString(
    rc = SQLITE_OK;
  }

- getnextstring_out:
+  *ppExpr = p;
+  return rc;
+no_mem:
+
  if( pCursor ){
    pModule->xClose(pCursor);
  }
  sqlite3_free(zTemp);
-  if( rc!=SQLITE_OK ){
  sqlite3_free(p);
-    p = 0;
-  }
-  *ppExpr = p;
-  return rc;
+  *ppExpr = 0;
+  return SQLITE_NOMEM;
 }

 /*
@ -232830,27 +232806,7 @@ SQLITE_API int sqlite3session_config(int op, void *pArg){
 /************** End of sqlite3session.c **************************************/
 /************** Begin file fts5.c ********************************************/

-/*
-** This, the "fts5.c" source file, is a composite file that is itself
-** assembled from the following files:
-**
-**    fts5.h
-**    fts5Int.h
-**    fts5parse.h          <--- Generated from fts5parse.y by Lemon
-**    fts5parse.c          <--- Generated from fts5parse.y by Lemon
-**    fts5_aux.c
-**    fts5_buffer.c
-**    fts5_config.c
-**    fts5_expr.c
-**    fts5_hash.c
-**    fts5_index.c
-**    fts5_main.c
-**    fts5_storage.c
-**    fts5_tokenize.c
-**    fts5_unicode2.c
-**    fts5_varint.c
-**    fts5_vocab.c
-*/
+
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS5)

 #if !defined(NDEBUG) && !defined(SQLITE_DEBUG)
@ -232860,12 +232816,6 @@ SQLITE_API int sqlite3session_config(int op, void *pArg){
 # undef NDEBUG
 #endif

-#ifdef HAVE_STDINT_H
-/* #include <stdint.h> */
-#endif
-#ifdef HAVE_INTTYPES_H
-/* #include <inttypes.h> */
-#endif
 /*
 ** 2014 May 31
 **
@ -254938,7 +254888,7 @@ static void fts5SourceIdFunc(
 ){
  assert( nArg==0 );
  UNUSED_PARAM2(nArg, apUnused);
-  sqlite3_result_text(pCtx, "fts5: 2024-11-25 12:07:48 b95d11e958643b969c47a8e5857f3793b9e69700b8f1469371386369a26e577e", -1, SQLITE_TRANSIENT);
+  sqlite3_result_text(pCtx, "fts5: 2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e", -1, SQLITE_TRANSIENT);
 }

 /*
@ -260129,7 +260079,7 @@ static int sqlite3Fts5VocabInit(Fts5Global *pGlobal, sqlite3 *db){
 }


-/* Here ends the fts5.c composite file. */
+
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS5) */

 /************** End of fts5.c ************************************************/
--- a/deps/sqlite/sqlite3.h
+++ b/deps/sqlite/sqlite3.h
@ -146,9 +146,9 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.47.1"
-#define SQLITE_VERSION_NUMBER 3047001
-#define SQLITE_SOURCE_ID      "2024-11-25 12:07:48 b95d11e958643b969c47a8e5857f3793b9e69700b8f1469371386369a26e577e"
+#define SQLITE_VERSION        "3.47.0"
+#define SQLITE_VERSION_NUMBER 3047000
+#define SQLITE_SOURCE_ID      "2024-10-21 16:30:22 03a9703e27c44437c39363d0baf82db4ebc94538a0f28411c85dda156f82636e"

 /*
 ** CAPI3REF: Run-Time Library Version Numbers
@ -652,13 +652,6 @@ SQLITE_API int sqlite3_exec(
 ** filesystem supports doing multiple write operations atomically when those
 ** write operations are bracketed by [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] and
 ** [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].
-**
-** The SQLITE_IOCAP_SUBPAGE_READ property means that it is ok to read
-** from the database file in amounts that are not a multiple of the
-** page size and that do not begin at a page boundary.  Without this
-** property, SQLite is careful to only do full-page reads and write
-** on aligned pages, with the one exception that it will do a sub-page
-** read of the first page to access the database header.
 */
 #define SQLITE_IOCAP_ATOMIC                 0x00000001
 #define SQLITE_IOCAP_ATOMIC512              0x00000002
@ -675,7 +668,6 @@ SQLITE_API int sqlite3_exec(
 #define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
 #define SQLITE_IOCAP_IMMUTABLE              0x00002000
 #define SQLITE_IOCAP_BATCH_ATOMIC           0x00004000
-#define SQLITE_IOCAP_SUBPAGE_READ           0x00008000

 /*
 ** CAPI3REF: File Locking Levels
@ -822,7 +814,6 @@ struct sqlite3_file {
 ** <li> [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
 ** <li> [SQLITE_IOCAP_IMMUTABLE]
 ** <li> [SQLITE_IOCAP_BATCH_ATOMIC]
-** <li> [SQLITE_IOCAP_SUBPAGE_READ]
 ** </ul>
 **
 ** The SQLITE_IOCAP_ATOMIC property means that all writes of
--- a/metadata/en-US/changelogs/30.txt
+++ b/metadata/en-US/changelogs/30.txt
@ -1,12 +0,0 @@
-* Improve, test, and fix some first time flow issues.
-* Show reasons for failing to connect.
-* Actually use CommonMark JS in "safe" mode(!).
-* Move app blob handling from JS to C.
-* Fixed "publish" command-line interface and used it to add a script that posts development activity updates.
-* Minor style improvements.
-* Make it possible to see the little graphs on mobile.
-* Updated dependencies:
-  * libbacktrace
-  * CodeMirror
-  * c-ares 1.34.3
-  * speedscope 1.21.0
--- a/src/ssb.c
+++ b/src/ssb.c
@ -220,7 +220,6 @@ typedef struct _tf_ssb_t
 	bool verbose;
 	bool store_debug_messages;
 	bool shutting_down;
-	bool shutting_down_deferred;

 	int messages_stored;
 	int blobs_stored;
@ -2010,7 +2009,7 @@ static void _tf_ssb_connection_destroy(tf_ssb_connection_t* connection, const ch
 			connection->debug_messages[i] = NULL;
 		}

-		if (--connection->ssb->connection_ref_count == 0 && connection->ssb->shutting_down_deferred)
+		if (--connection->ssb->connection_ref_count == 0 && connection->ssb->shutting_down)
 		{
 			tf_ssb_destroy(connection->ssb);
 		}
@ -2517,6 +2516,12 @@ void tf_ssb_destroy(tf_ssb_t* ssb)
 	tf_printf("tf_ssb_destroy\n");
 	ssb->shutting_down = true;

+	if (ssb->connections_tracker)
+	{
+		tf_ssb_connections_destroy(ssb->connections_tracker);
+		ssb->connections_tracker = NULL;
+	}
+
 	if (ssb->broadcast_listener.data && !uv_is_closing((uv_handle_t*)&ssb->broadcast_listener))
 	{
 		uv_close((uv_handle_t*)&ssb->broadcast_listener, _tf_ssb_on_handle_close);
@ -2632,20 +2637,10 @@ void tf_ssb_destroy(tf_ssb_t* ssb)
 		tf_ssb_connection_close(connection);
 		connection = next;
 	}
-	uv_run(ssb->loop, UV_RUN_NOWAIT);
 	tf_printf("Closed.\n");

-	if (ssb->connections_tracker)
-	{
-		tf_ssb_connections_destroy(ssb->connections_tracker);
-		ssb->connections_tracker = NULL;
-	}
-
-	uv_run(ssb->loop, UV_RUN_NOWAIT);
-
 	if (ssb->loop == &ssb->own_loop)
 	{
-		tf_printf("uv_loop_close\n");
 		int r = uv_loop_close(ssb->loop);
 		if (r != 0)
 		{
@ -2700,7 +2695,6 @@ void tf_ssb_destroy(tf_ssb_t* ssb)
 		ssb->room_name = NULL;
 	}

-	ssb->shutting_down_deferred = true;
 	if (ssb->connection_ref_count == 0)
 	{
 		uv_mutex_destroy(&ssb->db_readers_lock);
--- a/src/ssb.connections.c
+++ b/src/ssb.connections.c
@ -112,10 +112,6 @@ static void _tf_ssb_connections_get_next_after_work(tf_ssb_t* ssb, int status, v
 static void _tf_ssb_connections_timer(uv_timer_t* timer)
 {
 	tf_ssb_connections_t* connections = timer->data;
-	if (tf_ssb_is_shutting_down(connections->ssb))
-	{
-		return;
-	}
 	tf_ssb_connection_t* active[4];
 	int count = tf_ssb_get_connections(connections->ssb, active, tf_countof(active));
 	if (count < tf_countof(active))