@@ -1025,6 +1112,7 @@ const createEncryptedCardHTML = async (cardData, pollResults, cardIdentifier, co
+ ${showRemoveHtml}
Admin Support: ${adminYes}
Admin Against: ${adminNo}
diff --git a/assets/js/MinterBoard.js b/assets/js/MinterBoard.js
index 5b036fc..f88fc4b 100644
--- a/assets/js/MinterBoard.js
+++ b/assets/js/MinterBoard.js
@@ -5,7 +5,7 @@ let isExistingCard = false
let existingCardData = {}
let existingCardIdentifier = {}
const MIN_ADMIN_YES_VOTES = 9;
-const MINTER_INVITE_BLOCK_HEIGHT = 9999999; // Example height, update later
+const GROUP_APPROVAL_FEATURE_TRIGGER_HEIGHT = 99999999 //TODO update this to correct featureTrigger height when known, either that, or pull from core.
let isApproved = false
const loadMinterBoardPage = async () => {
@@ -999,7 +999,7 @@ const generateDarkPastelBackgroundBy = (name) => {
const handleInviteMinter = async (minterName) => {
try {
const blockInfo = await getLatestBlockInfo()
- const blockHeight = toString(blockInfo.height)
+ const blockHeight = blockInfo.height
if (blockHeight <= MINTER_INVITE_BLOCK_HEIGHT) {
console.log(`block height is under the featureTrigger height`)
}
@@ -1020,7 +1020,7 @@ const handleInviteMinter = async (minterName) => {
const processResponse = await processTransaction(signedTransaction)
if (processResponse?.status === "OK") {
- alert(`${minterName} has been successfully invited!`)
+ alert(`${minterName} has been successfully invited, please WAIT FOR CONFIRMATION...`)
} else {
alert("Failed to process the invite transaction.")
}
@@ -1046,9 +1046,9 @@ const createInviteButtonHtml = (creator, cardIdentifier) => {
const checkAndDisplayInviteButton = async (adminYes, creator, cardIdentifier) => {
const latestBlockInfo = await getLatestBlockInfo()
- const isBlockPassed = latestBlockInfo.height > MINTER_INVITE_BLOCK_HEIGHT
+ const isBlockPassed = latestBlockInfo.height >= GROUP_APPROVAL_FEATURE_TRIGGER_HEIGHT
- if (adminYes >= 9 && userState.isMinterAdmin) {
+ if (adminYes >= 9 && userState.isMinterAdmin && !isBlockPassed) {
const inviteButtonHtml = createInviteButtonHtml(creator, cardIdentifier)
console.log(`admin votes over 9, creating invite button...`, adminYes)
return inviteButtonHtml
@@ -1057,6 +1057,23 @@ const checkAndDisplayInviteButton = async (adminYes, creator, cardIdentifier) =>
return null
}
+const getMinterAvatar = async (minterName) => {
+ const avatarUrl = `/arbitrary/THUMBNAIL/${minterName}/qortal_avatar`
+ try {
+ const response = await fetch(avatarUrl, { method: 'HEAD' })
+
+ if (response.ok) {
+ return `
`
+ } else {
+ return ''
+ }
+
+ } catch (error) {
+ console.error('Error checking avatar availability:', error)
+ return ''
+ }
+}
+
// Create the overall Minter Card HTML -----------------------------------------------
const createCardHTML = async (cardData, pollResults, cardIdentifier, commentCount, cardUpdatedTime, BgColor) => {
diff --git a/assets/js/QortalApi.js b/assets/js/QortalApi.js
index 613386d..c45d927 100644
--- a/assets/js/QortalApi.js
+++ b/assets/js/QortalApi.js
@@ -1202,7 +1202,7 @@ const processTransaction = async (rawTransaction) => {
// Create a group invite transaction. This will utilize a default timeToLive (which is how long the tx will be alive, not the time until it IS live...) of 10 days in seconds, as the legacy UI has a bug that doesn't display invites older than 10 days.
// We will also default to the MINTER group for groupId, AFTER the GROUP_APPROVAL changes, the txGroupId will need to be set for tx that require approval.
-const createGroupInviteTransaction = async (recipientAddress, adminPublicKey, groupId=694, invitee, timeToLive = 864000, txGroupId = 0) => {
+const createGroupInviteTransaction = async (recipientAddress, adminPublicKey, groupId=694, invitee, timeToLive = 864000, txGroupId = 0, fee=0.01) => {
try {
// Fetch account reference correctly
@@ -1217,7 +1217,7 @@ const createGroupInviteTransaction = async (recipientAddress, adminPublicKey, gr
const payload = {
timestamp: Date.now(),
reference: accountReference,
- fee: 0.01,
+ fee: fee || 0.01,
txGroupId: txGroupId,
recipient: recipientAddress,
adminPublicKey: adminPublicKey,
@@ -1251,6 +1251,103 @@ const createGroupInviteTransaction = async (recipientAddress, adminPublicKey, gr
}
}
+const createGroupKickTransaction = async (recipientAddress, adminPublicKey, groupId=694, member, reason='Kicked by admins', txGroupId = 0, fee=0.01) => {
+
+ try {
+ // Fetch account reference correctly
+ const accountInfo = await getAddressInfo(recipientAddress)
+ const accountReference = accountInfo.reference
+
+ // Validate inputs before making the request
+ if (!adminPublicKey || !accountReference || !recipientAddress) {
+ throw new Error("Missing required parameters for group invite transaction.")
+ }
+
+ const payload = {
+ timestamp: Date.now(),
+ reference: accountReference,
+ fee: fee | 0.01,
+ txGroupId: txGroupId,
+ recipient: recipientAddress,
+ adminPublicKey: adminPublicKey,
+ groupId: groupId,
+ member: member || recipientAddress,
+ reason: reason
+ }
+
+ console.log("Sending group invite transaction payload:", payload)
+
+ const response = await fetch(`${baseUrl}/groups/kick`, {
+ method: 'POST',
+ headers: {
+ 'Accept': 'text/plain',
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify(payload)
+ })
+
+ if (!response.ok) {
+ const errorText = await response.text()
+ throw new Error(`Failed to create transaction: ${response.status}, ${errorText}`)
+ }
+
+ const rawTransaction = await response.text()
+ console.log("Raw unsigned transaction created:", rawTransaction)
+ return rawTransaction
+ } catch (error) {
+ console.error("Error creating group invite transaction:", error)
+ throw error
+ }
+}
+
+const createGroupBanTransaction = async (recipientAddress, adminPublicKey, groupId=694, offender, reason='Banned by admins', txGroupId = 0, fee=0.01) => {
+
+ try {
+ // Fetch account reference correctly
+ const accountInfo = await getAddressInfo(recipientAddress)
+ const accountReference = accountInfo.reference
+
+ // Validate inputs before making the request
+ if (!adminPublicKey || !accountReference || !recipientAddress) {
+ throw new Error("Missing required parameters for group invite transaction.")
+ }
+
+ const payload = {
+ timestamp: Date.now(),
+ reference: accountReference,
+ fee: fee | 0.01,
+ txGroupId: txGroupId,
+ recipient: recipientAddress,
+ adminPublicKey: adminPublicKey,
+ groupId: groupId,
+ offender: offender || recipientAddress,
+ reason: reason
+ }
+
+ console.log("Sending group invite transaction payload:", payload)
+
+ const response = await fetch(`${baseUrl}/groups/kick`, {
+ method: 'POST',
+ headers: {
+ 'Accept': 'text/plain',
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify(payload)
+ })
+
+ if (!response.ok) {
+ const errorText = await response.text()
+ throw new Error(`Failed to create transaction: ${response.status}, ${errorText}`)
+ }
+
+ const rawTransaction = await response.text()
+ console.log("Raw unsigned transaction created:", rawTransaction)
+ return rawTransaction
+ } catch (error) {
+ console.error("Error creating group invite transaction:", error)
+ throw error
+ }
+}
const getLatestBlockInfo = async () => {
try {
${decryptedCommentData.creator}:
-//${decryptedCommentData.content}
-//${timestamp}
-//