Merge pull request #266 from cheeaun/main

Update from main
2023-10-18 16:36:11 +08:00 · 2023-10-18 16:36:11 +08:00 · bf6ee572fb
parent 7b049385f7 26cf40dcea
commit bf6ee572fb
6 changed files with 259 additions and 32 deletions
--- a/.github/workflows/prodtag.yml
+++ b/.github/workflows/prodtag.yml
@ -1,4 +1,4 @@
-name: Auto-create tag on every push to `production`
+name: Auto-create tag/release on every push to `production`

 on:
  push:
@ -8,9 +8,20 @@ on:
 jobs:
  tag:
    runs-on: ubuntu-latest
+    permissions:
+      contents: write
    steps:
      - uses: actions/checkout@v4
        with:
          ref: production
      - run: git tag "`date +%Y.%m.%d`.`git rev-parse --short HEAD`" $(git rev-parse HEAD)
      - run: git push --tags
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - run: npm ci && npm run build
+      - run: cd dist && zip -r ../phanpy-dist.zip . && cd ..
+      - uses: softprops/action-gh-release@v1
+        with:
+          generate_release_notes: true
+          files: phanpy-dist.zip
--- a/.github/workflows/tagrelease.yml
+++ b/.github/workflows/tagrelease.yml
@ -1,26 +0,0 @@
-name: Create Release on every tag push in `production`
-
-on:
-  push:
-    tags:
-      - '*'
-  workflow_dispatch:
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: production
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - run: npm ci && npm run build
-      - run: cd dist && zip -r ../phanpy-dist.zip . && cd ..
-      - uses: softprops/action-gh-release@v1
-        with:
-          generate_release_notes: true
-          files: phanpy-dist.zip
--- a/src/app.css
+++ b/src/app.css
@ -1438,6 +1438,7 @@ body:has(.media-modal-container + .status-deck) .media-post-link {
  display: inline-block;
  margin: 4px;
  align-self: center;
+  text-align: center;

  &.clickable {
    cursor: pointer;
--- a/src/components/account-info.css
+++ b/src/components/account-info.css
@ -165,6 +165,77 @@
  animation: fade-in 0.3s both ease-in-out 0.2s;
 }

+.private-note-tag {
+  z-index: 1;
+  appearance: none;
+  display: inline-block;
+  color: var(--private-note-text-color);
+  background-color: var(--private-note-bg-color);
+  border: 1px solid var(--private-note-border-color);
+  padding: 4px;
+  line-height: normal;
+  font-size: smaller;
+  border-radius: 0;
+  align-self: center !important;
+  /* clip a dog ear on top right */
+  clip-path: polygon(0 0, calc(100% - 4px) 0, 100% 4px, 100% 100%, 0 100%);
+  /* 4x4px square on top right */
+  background-size: 4px 4px;
+  background-repeat: no-repeat;
+  background-position: top right;
+  background-image: linear-gradient(
+    to bottom,
+    var(--private-note-border-color),
+    var(--private-note-border-color)
+  );
+  transition: transform 0.15s ease-in-out;
+  overflow-wrap: anywhere;
+
+  span {
+    color: inherit;
+    opacity: 0.75;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: -webkit-box;
+    display: box;
+    -webkit-box-orient: vertical;
+    box-orient: vertical;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    text-align: left;
+  }
+
+  &:hover:not(:active) {
+    filter: none !important;
+    transform: rotate(-0.5deg) scale(1.05);
+
+    span {
+      opacity: 1;
+    }
+  }
+}
+.account-container .private-note {
+  font-size: 90%;
+  color: var(--text-insignificant-color);
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  padding: 12px;
+  background-color: var(--bg-faded-color);
+  display: flex;
+  gap: 0.5em;
+  align-items: center;
+
+  b {
+    font-size: 90%;
+    text-transform: uppercase;
+  }
+  p {
+    margin: 0;
+    padding: 0;
+  }
+}
+
 .account-container .note {
  font-size: 95%;
  line-height: 1.4;
@ -228,10 +299,11 @@
  align-items: center;
 }
 .account-container .actions button {
-  align-self: flex-end;
+  /* align-self: flex-end; */
 }
 .account-container .actions .buttons {
  display: flex;
+  align-items: center;
 }

 .account-container .account-metadata-box {
@ -571,3 +643,30 @@
      drop-shadow(8px 0 8px var(--header-color-4, --bg-color));
  }
 }
+
+#private-note-container {
+  textarea {
+    margin-top: 8px;
+    width: 100%;
+    resize: vertical;
+    height: 33vh;
+    min-height: 25vh;
+    max-height: 50vh;
+    color: var(--private-note-text-color);
+    background-color: var(--private-note-bg-color);
+    border: 1px solid var(--private-note-border-color);
+    box-shadow: 0 2px 8px var(--drop-shadow-color);
+    border-radius: 0;
+    padding: 16px;
+  }
+
+  footer {
+    display: flex;
+    justify-content: space-between;
+    padding: 8px 0;
+
+    * {
+      vertical-align: middle;
+    }
+  }
+}
--- a/src/components/account-info.jsx
+++ b/src/components/account-info.jsx
@ -643,7 +643,9 @@ function AccountInfo({
                        >
                          <div>
                            {postingStats.daysSinceLastPost < 365
-                              ? `Last ${postingStats.total} posts in the past 
+                              ? `Last ${postingStats.total} post${
+                                  postingStats.total > 1 ? 's' : ''
+                                } in the past 
                      ${postingStats.daysSinceLastPost} day${
                                  postingStats.daysSinceLastPost > 1 ? 's' : ''
                                }`
@ -770,6 +772,7 @@ function RelatedActions({
    requested,
    domainBlocking,
    endorsed,
+    note: privateNote,
  } = relationship || {};

  const [currentInfo, setCurrentInfo] = useState(null);
@ -851,6 +854,7 @@ function RelatedActions({

  const [showTranslatedBio, setShowTranslatedBio] = useState(false);
  const [showAddRemoveLists, setShowAddRemoveLists] = useState(false);
+  const [showPrivateNoteModal, setShowPrivateNoteModal] = useState(false);

  return (
    <>
@ -861,9 +865,11 @@ function RelatedActions({
          ) : !!lastStatusAt ? (
            <small class="insignificant">
              Last post:{' '}
-              {niceDateTime(lastStatusAt, {
-                hideTime: true,
-              })}
+              <span class="ib">
+                {niceDateTime(lastStatusAt, {
+                  hideTime: true,
+                })}
+              </span>
            </small>
          ) : (
            <span />
@ -872,6 +878,19 @@ function RelatedActions({
          {blocking && <span class="tag danger">Blocked</span>}
        </span>{' '}
        <span class="buttons">
+          {!!privateNote && (
+            <button
+              type="button"
+              class="private-note-tag"
+              title="Private note"
+              onClick={() => {
+                setShowPrivateNoteModal(true);
+              }}
+              dir="auto"
+            >
+              <span>{privateNote}</span>
+            </button>
+          )}
          <Menu
            instanceRef={menuInstanceRef}
            portal={{
@ -925,6 +944,16 @@ function RelatedActions({
                  <Icon icon="translate" />
                  <span>Translate bio</span>
                </MenuItem>
+                <MenuItem
+                  onClick={() => {
+                    setShowPrivateNoteModal(true);
+                  }}
+                >
+                  <Icon icon="pencil" />
+                  <span>
+                    {privateNote ? 'Edit private note' : 'Add private note'}
+                  </span>
+                </MenuItem>
                {/* Add/remove from lists is only possible if following the account */}
                {following && (
                  <MenuItem
@ -1235,6 +1264,24 @@ function RelatedActions({
          />
        </Modal>
      )}
+      {!!showPrivateNoteModal && (
+        <Modal
+          class="light"
+          onClose={() => {
+            setShowPrivateNoteModal(false);
+          }}
+        >
+          <PrivateNoteSheet
+            account={info}
+            note={privateNote}
+            onRelationshipChange={(relationship) => {
+              setRelationship(relationship);
+              // onRelationshipChange({ relationship, currentID: accountID.current });
+            }}
+            onClose={() => setShowPrivateNoteModal(false)}
+          />
+        </Modal>
+      )}
    </>
  );
 }
@ -1432,4 +1479,95 @@ function AddRemoveListsSheet({ accountID, onClose }) {
  );
 }

+function PrivateNoteSheet({
+  account,
+  note: initialNote,
+  onRelationshipChange = () => {},
+  onClose = () => {},
+}) {
+  const { masto } = api();
+  const [uiState, setUIState] = useState('default');
+  const textareaRef = useRef(null);
+
+  useEffect(() => {
+    let timer;
+    if (textareaRef.current && !initialNote) {
+      timer = setTimeout(() => {
+        textareaRef.current.focus?.();
+      }, 100);
+    }
+    return () => {
+      clearTimeout(timer);
+    };
+  }, []);
+
+  return (
+    <div class="sheet" id="private-note-container">
+      {!!onClose && (
+        <button type="button" class="sheet-close" onClick={onClose}>
+          <Icon icon="x" />
+        </button>
+      )}
+      <header>
+        <b>Private note for @{account?.acct}</b>
+      </header>
+      <main>
+        <form
+          onSubmit={(e) => {
+            e.preventDefault();
+            const formData = new FormData(e.target);
+            const note = formData.get('note');
+            if (note?.trim() !== initialNote?.trim()) {
+              setUIState('loading');
+              (async () => {
+                try {
+                  const newRelationship = await masto.v1.accounts
+                    .$select(account?.id)
+                    .note.create({
+                      comment: note,
+                    });
+                  console.log('updated relationship', newRelationship);
+                  setUIState('default');
+                  onRelationshipChange(newRelationship);
+                  onClose();
+                } catch (e) {
+                  console.error(e);
+                  setUIState('error');
+                  alert(e?.message || 'Unable to update private note.');
+                }
+              })();
+            }
+          }}
+        >
+          <textarea
+            ref={textareaRef}
+            name="note"
+            disabled={uiState === 'loading'}
+          >
+            {initialNote}
+          </textarea>
+          <footer>
+            <button
+              type="button"
+              class="light"
+              disabled={uiState === 'loading'}
+              onClick={() => {
+                onClose?.();
+              }}
+            >
+              Cancel
+            </button>
+            <span>
+              <Loader abrupt hidden={uiState !== 'loading'} />
+              <button disabled={uiState === 'loading'} type="submit">
+                Save &amp; close
+              </button>
+            </span>
+          </footer>
+        </form>
+      </main>
+    </div>
+  );
+}
+
 export default AccountInfo;
--- a/src/index.css
+++ b/src/index.css
@ -62,6 +62,9 @@
  --close-button-bg-active-color: rgba(0, 0, 0, 0.2);
  --close-button-color: rgba(0, 0, 0, 0.5);
  --close-button-hover-color: rgba(0, 0, 0, 1);
+  --private-note-text-color: var(--text-color);
+  --private-note-bg-color: color-mix(in srgb, yellow 20%, var(--bg-color));
+  --private-note-border-color: rgba(0, 0, 0, 0.2);

  /* Video colors won't change based on color scheme */
  --media-fg-color: #f0f2f5;
@ -111,6 +114,7 @@
    --close-button-bg-active-color: rgba(255, 255, 255, 0.15);
    --close-button-color: rgba(255, 255, 255, 0.5);
    --close-button-hover-color: rgba(255, 255, 255, 1);
+    --private-note-border-color: rgba(255, 255, 255, 0.2);
  }
 }